[user]
	name = Foradis Theodoros
	email = theodoros.for@openmailbox.org

[alias]
    a = add --all
    c = commit
    st = status
    co = checkout
    up = pull --rebase=preserve
    g = grep --break --heading --line-number
    fa = fetch --all
    p = push
    pf = push -f

[color]
    diff = auto
    status = auto
    branch = auto
[push]
    default = simple
[diff]
        tool = ediff
        guitool = ediff

[difftool "ediff"]
        cmd = ~/.ediff.sh $LOCAL $REMOTE $MERGED

[merge]
        tool = ediff

[mergetool "ediff"]
        cmd = ~/.ediff.sh $LOCAL $REMOTE $MERGED $BASE
        trustExitCode = true